Adds support for more than 20 nested entity aliases