Updated to work with latest DEV + Fixed displaying raw data