Further refactoring selections and models