Issue #19: Added check for overlapping entries