Fixed properties and added support for entity properties in configuration file