Changes to implement user listing