Split out state interfaces