Updated to use new common.parse