More things towards modularisation