Initial changes for ION support