Added entities support inside packages