Handle more keys