Added users and modified interface