Removed prefix-free dependency, added prefixes