0.12 - Split into classes (except for map)