Converted procedure definitions to the new style