Refactored default type config