Refactored.
Added additional IDL classes.