added mask_user and unmask_user methods