Better static/instance handling