Updates to common module