Import stuff from old build