Added carbonate template and modifed carbonate class