readded indexes and schema