Split out more components