Add simple indexes and fix drop_constr file