Updated path variables and added some annotation.