Made several classes immutable.