Added roles/states into schema