[FEATURE] Fixed the basic routing and enabled the bundle