Added DAO
Added StorageManager