Better check, generation and logging