Added handle parameter to all functions