Added more config functionality