Add scale factor
Refactor world model type