few change on entities