Adding more properties and fields