Thank you, the new plugin files worked perfectly. I have also updated my code as suggested. Much cleaner. Great work!
