Add properties instead of getattr