Added small enhancements