Network call and Token handling added