replaced Entity* with EntityHandle for future work