Use better types for peer state data