Use underscore column names for timestampable fields
Fix retrieval of template