Better handling of separator option