moved to universal User managing approach