Added simplified command building