Added expires support