Improve base design