Criticism of the Trudeau government’s delay in making good on an election campaign promise of new gun control measures has prompted the government to promise a bill containing the entire “package” of election promises before the end of 2017.

Following critical comments by two of Canada’s leading gun-control advocates in the wake of Sunday’s Las Vegas gun massacre, Public Safety Minister Ralph Goodale said Tuesday the legislation will cover the entire gun control program the party promised in its 2015 election package — including tougher screening for sales of restricted firearms and measures compelling vendors to keep records of all gun sales to help police investigate firearm trafficking and gun crimes.

Goodale said the legislative measures would be in addition to steps the government already has taken since the 2015 election.

“It’s a process that is ongoing and we have taken some important steps. The step of making sure that classification is in the hands of experts and professionals, rather than in the hands of politicians, is an important change, and that change has been put into effect,” Goodale said.

He was referring to the cancellation of a Conservative cabinet directive that reversed an RCMP decision to prohibit a Czech-made semi-automatic firearm because it can be easily converted into a fully-automatic rifle.

The same model of rifle reportedly was used in a mass shooting at a mosque in Quebec City last January which killed six people and injured 19.

Although the Liberal cabinet reversed the Conservative cabinet directive, it would take amendments to the Criminal Code to eliminate cabinet’s authority to overrule RCMP gun classifications.

“The withdrawal of the ministerial directive that essentially gave certain manufacturers the ability to classify their own weapons — that is an important change,” Goodale said. “Putting the new more inclusive and presentative members of the firearms advisory committee into place, that is an important change.”

Two founding members of a national coalition for firearms control created in the wake of the shooting deaths of 14 women at Montreal’s L’Ecole Polytechnique engineering school in 1989 told iPolitics Monday they hoped the Las Vegas deaths would spur the Liberals into making good on their campaign commitments two years after the election.

“I would expect to have a legislative package consistent with the commitments that we made during the election campaign, with respect to firearms, before the House of Commons before the end of the year,” Goodale said. “We’ve been working on the legislative package that is required, that work is ongoing.”

Asked if that includes the platform’s reference to mandatory records of gun sales, Goodale replied: “The package will be consistent with the provisions that we described in our election platform. That’s the working blueprint.”

News reports from Las Vegas indicate police found converted semi-automatic rifles among an arsenal of firearms shooter Stephen Paddock had stored in a high-rise hotel room he used as his shooting platform.

The Liberal election platform contained eight separate measures aimed at reversing some of the changes made under the previous government.

Those included: the repeal of legislative changes making it less cumbersome for owners of restricted firearms to take their guns to shooting ranges; $100 million annually for the provinces and territories to help police reduce gang violence; and legislated requirements for vendors to confirm whether gun licences are valid before a sale.