Quick refactor to add support to Configuration Builder