Changes after integration testing