[Core] Update some Eluna code