Added locatiopn support