[WIP] Improved client side integration