Removed the hard reliance on the common library