Remove double dispatch