Improve support

Still a work in progress, but adding new fields and improving
documentation.