Refactor + add version to form and link version to collector file