improved objectmap using generics