Adding a couple of fields as per the new XML for API v2

Have updated the tests and also put in a gradle build file.