I'm still on the edge about having the driver for core bundle or not... But let's keep it this way for now!