Changes to make types work