Added full-static support