Added multiobject file parsing + code refactor