Staging enhancements for 2.0 release