More reusablility is now in place