Added standstate to Unit