Move chooser handler to extras repo