Refactoring duration type list