Change to new API
Refactor.
Move params to private method
Add select list.