Update for latest changes