Eluna: Change back to use eluna util