Added support for expiration policy
Version bump