After main integration with Storage Server