Adding adobe form support, part 2

Couldn't modify the other pull request so I had to create a new one. As before let me know if something is off.