removed dependency on support package