Updates for MVC and GUI