Added Suffix support