Added username support in users module