Updated some calls
Removed the process heap
Refactor