Adopt a better structure