Added max length and complete common bundle integration