Feature/update keys

My take on #357