make group optional for entity