Use new common functions