Start to port to new API