Making system use NewEntity functions