Changed immutable to mutable implementation to remove builders