Bug 5421 - Add new Eos instancies classes