#402 Add required flags