Reduced duplicated code; Added user listing; Restricted viewable data based on user role