Medical marijuana bills Gov. Neil Abercrombie signed into law Tuesday have long been needed to update the state’s program and shift the focus from law enforcement to medical and health concerns, advocates said.

"Hawaii once led the nation in recognizing the need for a medical marijuana program, and so these measures today represent important next steps," said Vanessa Chong, executive director of the American Civil Liberties Union of Hawaii. "Hawaii finally is moving toward patient-focused policies."

The measures, House Bill 668 and Senate Bill 642, were among six the governor signed in ceremonies in his office Tuesday.

Other proposals included SB 680, establishing a state Office of Homeland Security; SB 682, authorizing county fire chiefs to ensure that building plans comply with fire codes; SB 1077, placing limits on owner-builders applying for contractor licenses; and HB 144, clarifying regulations for professional employer organizations.

Although Hawaii was the first state to pass legislation approving the use of medicinal marijuana — seven other states had done so previously through ballot measures — advocates said the state fell behind those that began managing their initiatives as health programs.

House Bill 668 would transfer administration of the medical marijuana program to the Department of Health from the Department of Public Safety on Jan. 1, 2015. Senate Bill 642 would make substantial changes to the program, such as adjusting how much marijuana a patient may possess. The measure would allow patients to have an "adequate supply" of four ounces and a total of seven plants, regardless of the plants’ maturity. The previous law allowed three mature plants with one ounce of usable marijuana each and four immature plants.

Abercrombie praised the Legislature for dealing with the issues and thoroughly vetting the proposals.

"We don’t want to allow criminals to set the standard by which medical procedures, let alone medical personnel, go into these directives," the governor said. "In other words, someone else’s pain is going to be addressed on the basis that somebody else might commit a criminal act.

"That is not what I think a society that has a sense of compassion and a society which values freedom — that isn’t a course they want to pursue."