Finished integration with uOS