Map tool improvements