Updates for latest changes