Change from deprecated manifest erasure to runtimeClass