External users compatibility

Added external users compatibility & some bugs fixed