added indexes to improve performance