Updated to 1.2 compatibility