Made datastructures and approximation ready for hackage upload