Fix multiple space names
Add Rho class