Move chooser to extras