Move to object-based simulation