Changes for 3.0.4
Updates for 3.0.4