Some code refactoring to prevent repeated code.
FluentStructure can now take only one argument if both keys are the same format.