Added selection controller as a custom module