[WIP] Idea to fix SOAP