Updated transformation classes etc.