added checks for new indexed objects