Add private properties and formatting