Adapting to new framework. (Not yet ready)