Parsing and I/O done for instances
Refactoring (again) + API completion