Updates to reflect changes to codebase.