Few improvements, logicException, hasItems