Added enabled and expired properties to class user