Update Setup source and template
Don't make this property static