improved Quaternion support