Switched to immutable collections