Added new enhancement