Final commit for enhancements