Replaced usings with overloads

TODO: add tests for all overload