Improved semantics