Entities modified to support collections