Added configuration infrastructure