Add some controllers and fixed problem with PersistenceManager