Add Canada and improve .bs