Update to reflect package changes