Add prefix/suffix support