Updated feature with latest api version also have some rearranging of fields