Changed a lot of types