Updated to v1.6 feature set