Update to reflect recent changes