add entiy support and tests