Update for compatibility with latest Maera Core restructuring