Added Controller layer