enhanced schema, began refactoring entity persistence into own area