Add build unit logic to "Base" class and refactor variable names