Fix #7 - Update examples to work with current codebase