Added support for the weighted adaptation scheme