Refactor of users data