Updated how prefixes are provided