Make formulation slightly more generic