Added way controllers defined to match best practices