Refactor after integrate with Stackla