Switched JSDatabase to using FillTemplate
Switched JSDraw to using FillTemplate