Further reduce duplication