Added activiy model and controller