Added optional expiration date