Fixing issues related to the new package in Profile-Client