Fixed usings for #8