Adjustments to modified classes