Change to a more complex separator, use constant