added few more enhancements