Completed 1.4 support