Finished Template Database Decorator (need to build test)