FCStack refactoring