Adding handle wrapper