better mapping and added node compiler