Add support for different storage dir