simplified key structure even more
release 2.0.0