First commit of enhancements