Updates to various controllers to comply with a more simple structure