Refactor modelBuilder to registry and set up default model