Refactor, change CPT hash value representation