Added handle. Though optimizing test seems to be not working anymore