Nicer examples
Maintain backwards compatibility