Added updateEntityAsync and removeEntityAsync