Refactor type-specific containers