Add option for embedded start