Updated to work with google libraries