Open Kit Integration related changes