Several space classes has been added