Switched to flat file template