(#157) - Fix config data model & api