Added command builder