Changed key structure for better readability

see issue #85