added dynamic and static entities