RISCOSS-287: Add support for storing distribution