updated mappings and fixed compile errors