Added Respec 2 compatibility