Added immutability checks
TODO