Add states, categories. Move animation types.