Merge pull request #3 from wardi/master

add remaining fields to schema
Basic template changes for the extension since it is now using a different schema
Merge pull request #4 from thriuin/master

Basic template changes for the extension since it is now using a differe...