Added api username support