Added stack and heap