Added expired token check