Fix context
Move include files to JSON instead of Extension