Adding partial long stack support