Added more sourcepath support