Add rate calculator and g map