Updated to use Separator and Terminator