Cleaning up
Fixed problem with loading default prefixes