Updated template classes