Updated hscommon