Entity Factory II