Make the composition storage working