Refactored tool,added attributes and values