Refactor heap item types