Changed to descriptive config types