Updated tag version and some parameterized