Improve behaviours, augmentation, ...