Adding mechanics for storage queue