EW-61 - Refactored less structure.