added support for external users