- Add support of expiration field