switched to non-deprecated Immutable annotation