Current limitations to more powerful entity hierarchy

Some improvements were added in the last release