Update to reflect changes to source code