Working on mercurial support