Adding and Fixing Source Analysis