CISCONAED-1 - refactoring