Make method class-static instead of global