Adding support for abstract user