Refactored infobox calculation method (OMS-359)