Added additional states for assignments and relevant views.