Fix 139 - Integrate the LocationStatic class