move method back to entityindex