Adapt to new style API
Adapt to new select/modify interaction API