Add accessors
Improve seperator handling