Added some enhancements