Changes for new POJO config.