Added Controller and Factory