Catch up with updated framework