More changes for version 5.1