LMW-82 Architecture refactor