BaseModel and BaseCollection improvements