Adding current user singleton
Improving currentuser singleton