Added Single/List support for user & poolgroup entities