Refactor config beans