Added parser for grouped and repeated observations