Added Destination Class & minor updates