Added more structure config, more changes to be done.