Modified the API + added helpclasses.