Add POJO configuration and new prepare phase