Changes for Generic Stack