DEVIDM-54 - Adjusted for api changes.
Merge pull request #62 from iceglow/DEVIDM-54

DEVIDM-54 - Adjusted for api changes.