Initial support for Moroder hierarchy