First pass support for 1.6.4