Add retrieval method

Also fixed a bug in the split