Added source1 compatibility