Implement remaining states