To index fields from Base entity

Added new logic to index data from the parent class