added entity and aspect logic