[DIRTY] improoved create entity