Rewritten most of Helper-Classes