Added utility classes + some utility methods, controller class