Added extra properties and sanitize function