Improving the lookup of the operational attributes.
Removing unused imports.