Adapting to new framework