Feature/new fields