Fix bugs in model storage
Inject ordered in builders