Add support for EXPIRE