Added activity controller, model