Made the changes for clean features by adding * id
Made the changes for timeout