Made source directory optional as well