Added proper configuration