Update Core Model and Controller

Update core model and controller for (cleanup)