Finally opting for a modular version using open descriptions.