Issue #18 - More validation improvements