Use Key and Value as types instead of bloating with empty interface