Added handle class