adapt for singleton entity