added static support