#13: Changes in usersFactory