MNT: Updates to analysis api