Added lot's of nice proper data