Adding simple unit builder