Added validator code for new kinds - Issue #27