Extended TargetParser to support provider