Enhancements for 0.2