Entites now return modifiable collections