Made some statics non-static