Update examples, make some things optional