Added Tabular plugin and custom mappings