Adaptations for v1.5