Removed dependency on Hyphen