Updates for 1.3, standardization