Adding object controller generator and fixing the store