moving class defintion out of the function
removing ini templates since we can use the generic one