Type mapping in, fix that and add authors