Added support to sub-packages for entities