Artifact Handler code changes