Added more examples, added different types of fields support in adhoc