Added the new structure to generation of listings