Additional changes to the com implementation