Fixed so dont need to set collection => true on collection properties