Updates and enhancements

Updates and enhancements