updating MainController and generic Dao and basicService classes