add improve mapper; urls; etc