Finishes updating key module for new api.