Adding Some Enhancements