More 1.10 API stuff and more sane class structure