Update to use facade