Really improved how prefixes are handled & defined