SAFE Planning Adaptations