Include missing module and remove call to older api