Updated with necessary configuration