Refactored solution with new members additions