Updated code to compile against new libraries