Add refactored solution