Move into same #map
Update model func sig
Update call to newer function sig
Update filedb function sig so fn is still availible