Work with latest IR dev