Added additional functionality for Controllers and Models