Refactorings
Added defects provider