Updated to include Stack Entities