We should really refactor this object like discussed by mail...