Add coversall support