Updated to new defined variable locations and common libraries