Added static method support