Defects management