Update to reflect current development additions.