Added expiration to token and validation function