Adding expired date calculations