#19 Support original example format