Yeah, that would be the canonical solution. Modularity is better