Updated Custom Tag Mapping
DB Migrate Changes
Merge pull request #1 from GazDog/master

Couple of changes