Use static methods instead of singleton