changes to strong classes