Added modifications to add user methods