[W-I-P] Added Builder for each Executable type