Add compatibility with uPaaS