Added some enhancements.