Prepared the selector to get access to booth models

Fully populated (before this the only one the selector had access to)
As written (like written in the pom)