Commands correctly self-detecting