Reworked directory commands for multiple users