Deprecated Bundle structure and made some modification in solve.