Added location fields