Add basic unit builder