Switch to more modern services specification