Added templates sort of