Made updates to reflect the changes inteh Ferma API.

Change-Id: I4e0112a6d59356f2cdaab8e09efabf1011bf9f74