Update the common module
Update the stubs accordingly