Solution for make it modular