More flexibility in what keys are accepted for converting from hash