Add more structure into it.