adding support for UserProperties in Endpoints