Some enhancements

Some enhancements