Updated to match framework