Add some more immutable usage