Configuration method change, make it more lightweight