Additional data types to AdvancedPropertiesFile and some economy stuff