Make things compatible with Architect 3.0