Added updateEntityAsync & removeEntityAsync