Merged in new registry code