Added classes. Mostly Changes to the API.