different key for aws store, refactor ws handler