Added entity generation (not runnable yet)