Added APIGen bundle stuff