Changes related to integration