Some refactoring, more to come
Added remote ghost for IAs
Some refactor on upstream module