Added more properties to form