Feature/model field expansion