Updated token watch dog & added access control logic