As DMSv1 now marked as deprecated, we need to implement newer version of API, also required for cleanup
As DMSv1 now marked as deprecated, we need to implement newer version of API, also required for cleanup