Added wrapper class to get rid of static methods for a better testing basis