Get embedded fields working properly