Better signatures (more flexibility, a bit less useless client side computations)

Nothing changes "visually"