add support for new API and for getting Field info