Most things are optional now