Fixed Storage handler implementation and added device select.