Added prefix and suffix support