Fixing Integer reference in mapped types