Added new properties and settings