Refactoring to allow shared configurations