I talked about this with Wojciech Trocki, I suggested to wait for this https://github.com/aerogear/mobile-docs/pull/403 to be merged, because depending on what that PR will contain at the end, it will be more clear what needs to be done here.