DEVIDM-54 - Adjusted for api changes.