Simplified the handles handling.