Updated common module