Few indexes added to improve performance