Updated Account schema to have all the definitions. And rearranged the attribute order to match the pojo's.