Moved prefixing to parser