Align with Eve v0.3