Added new template for indicator records
Rebuilt to allow for better naming of database