Add 4.4 compatibility