Entity Pool Updated -- Needs more optimization