Added source compatibility