A load more work on model and collection schema