Config improvements