Added command infrustructure