First batch of changes for kraftwagen