Updates to accomodate latest dependencies