Adding support for extra properties in user data