Fed up of core.Users / modules.Users confusion