Split requirements in 5.18