Updated model and collection