Refactored implementation of configurations