Adding two more semantic restrictions (tests still needed)