Small changes to get this working with the current structure.