Version 1.2 enhancements