Only include 'fields' model if needed
Switch to basic MongoDB implementation