Added more funktions and data.