updated output structure to be more clean