Added limited user functionality