Added hex and oct support