Add VCS Control Fields and change maintainer email