Make opal runtime hierarchy simpler