Add key support
2.1.0