included some refatoring and the double despacho is beeing generated.