Added users support