Generic-ify entities