Make it Modular solution