Better omnibus management