Improved chapter mapeamento