Update for new boot options