There was no clear way on how to do this if you wanted to use universal though. The CLI never supported it for ages. Does it support it now?