Feature/fn data model