Added Prefix and Suffix support.