Changes required for updated lib