Improved planning and scheduling