added workspace mapping