Add prefixes and suffix support

Adds support for prefix and suffixes.