Added static and non-static methods