Converted Index to EntityNG