Make version extraction overridable
Add some missing types