Change imports, change to staticmethods