Usings refactored