Feature/field expansion