Add classes from 1.0.2-SNAPSHOT ups and align the API with them.