Add authority field when specified, fix copy constructor