Added an optional association between an aspect and a sheet
Added a few more settings for aspect types
Use uppercase names for discriminator column values
Split the aspect entity into multiple subtypes