Better hash option handling