Revamp to separate the Model/Collection fluent layers from the underlying mechanisms more
Fix a few more bugs after the revamp