Add the (mostly autogenerated) stuff