Updates for version 3.0.6