Make sure method signatures match the original
remove convoluted inheritance chain in favor of class aliases
Convert metadata inheritance to class alias