Expireable/Contactable Refactor