Temporary hack in custom fork to accomodate User properties.