Made Config more robust