Updates to dependencies and additional options