Made Animal template more robust