Added view users support