Modernization
Added coverage