Added mock user support