Fix for inheritend metadata bug + update to allow manual metadata construction with inherited types