Created more mapping for basepath/secondarybasepath