porting schemas - map schema, bugs fix