Removed dependency on Billy namespace