Experimental Build generic AddCommand #86