add more structured command layout