add postfix component and some minor changes