Some enhancements for recruit system