Added static support