Started integrating new construct output