Add new solutions and modify structure