4 Slots for the builds is not enough

Anyone else agree that 4 slots is just waaaay to little to make a fun build?

At least make it so the powers/buildings have separate slots to the units.