More Scalafication of power package.