Add Types for Ideal State, fix Payload Format (#2168)