added indexes and keys