Added current user functionality