Migration to new framwork