Expiration model relations improvement