Issue LIBCLOUD-389: Removing the plural and setting default to None