Added new classes for ioc management