Move two types of command to templates