Replaced dimension with embeddable entity