Remove @Immutable since it's creating errors and isn't needed