New awsome Entity_factory Property is added. And some minor changes.