Minor usings alteration