Add new duplication check also for commands