Moved a few config settings in from Application
Added some property traits for entities