Adding comparator and Commander