added bundle and entities