Primary authority scheme to be further extended to fire safety