Factorout entities