Add sphere and free surface mapping