- Change ExpirationType from enum to class