More integration and fixes of new objects