Additional gravity modeling improvements