Added types that have embedded types