updated storage/database layer