Refactored into isisaddons structure, for 1.6.0.