Added model() and collection() api back