Generic STACK implementation update