more immutability
More immutability in the model
Removed redundant immutable list from the client model