added prefix and postfix support