Enhancements and suggestions on WIP