Fixed behavior for "model" and "collection" types