Minor update
Some new wrapper classes