Added more data and added core stuff