Got rid of immutables