Added config and structure