Changed interface, added chooser