Selection api updated