Added hex string support