Refactored prefixing