Updated to 3.1 compatibility