Adding locale functionality