Restrict the versions and add 3.1