Adding basic volumes support