Gazebo model improvements