New definitions format and API for 4.0

This is a test, see https://gist.github.com/mnapoli/6890585