Improved preconditions