Additional adaptations