CompositeEntity modified to use string indices