Changes to behaviour modules