more changes to the DAL and empiremanager