Updated build system, fixed  handling between instances