Clean up the hash problems so we can move methods for object creation out of the database