Added source and path properties