Improve base structure