Updated to work with newest Iron