Fixed timeout and added CPD