Added orientation management, sorted usings