Temporarily removed tested dependency
Merged runtime and compile-time types.