New database format, fixes in the controller