Change way separators and padding are handled