added type mapping to direct embedding (fixes tests)