Upgraded to Common 0.4.4.4