WIP - Adapts to PresentationCompile API changes