Added support for effectiveDateEnabled