added custom bundle support